From d5b31edb78f691e541c150f58bb977d9f2ae39bc Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 25 Aug 2025 15:33:08 +0800 Subject: [PATCH] rclone: Update to 1.71.0 Removed upstreamed patch. Release note: https://github.com/rclone/rclone/releases/tag/v1.71.0 Signed-off-by: Tianling Shen --- net/rclone/Makefile | 6 +- ...llow-insecure-TLS-ciphers-fixes-8701.patch | 98 ------------------- 2 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 net/rclone/patches/001-ftp-allow-insecure-TLS-ciphers-fixes-8701.patch diff --git a/net/rclone/Makefile b/net/rclone/Makefile index bdf7148136..f7096be898 100644 --- a/net/rclone/Makefile +++ b/net/rclone/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.70.3 -PKG_RELEASE:=2 +PKG_VERSION:=1.71.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=0b25fb9f0cb26883cfa885576ddb34276564a1e224edc5aacab826f9ba22179d +PKG_HASH:=20eab33e279e7c14a20174db43277de3f5bbdcd248103e014d6e54374b43224a PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/net/rclone/patches/001-ftp-allow-insecure-TLS-ciphers-fixes-8701.patch b/net/rclone/patches/001-ftp-allow-insecure-TLS-ciphers-fixes-8701.patch deleted file mode 100644 index e9c2d5741b..0000000000 --- a/net/rclone/patches/001-ftp-allow-insecure-TLS-ciphers-fixes-8701.patch +++ /dev/null @@ -1,98 +0,0 @@ -From d71a4195d68f2a3b0b5359240036e9770962c8d6 Mon Sep 17 00:00:00 2001 -From: Anagh Kumar Baranwal <6824881+darthShadow@users.noreply.github.com> -Date: Wed, 23 Jul 2025 20:20:31 +0530 -Subject: [PATCH] ftp: allow insecure TLS ciphers - fixes #8701 - -Signed-off-by: Anagh Kumar Baranwal <6824881+darthShadow@users.noreply.github.com> ---- - backend/ftp/ftp.go | 65 ++++++++++++++++++++++++++++++---------------- - 1 file changed, 42 insertions(+), 23 deletions(-) - ---- a/backend/ftp/ftp.go -+++ b/backend/ftp/ftp.go -@@ -164,6 +164,16 @@ Enabled by default. Use 0 to disable.`, - Default: false, - Advanced: true, - }, { -+ Name: "allow_insecure_tls_ciphers", -+ Help: `Allow insecure TLS ciphers -+ -+Setting this flag will allow the usage of the following TLS ciphers in addition to the secure defaults: -+ -+- TLS_RSA_WITH_AES_128_GCM_SHA256 -+`, -+ Default: false, -+ Advanced: true, -+ }, { - Name: "shut_timeout", - Help: "Maximum time to wait for data connection closing status.", - Default: fs.Duration(60 * time.Second), -@@ -236,29 +246,30 @@ a write only folder. - - // Options defines the configuration for this backend - type Options struct { -- Host string `config:"host"` -- User string `config:"user"` -- Pass string `config:"pass"` -- Port string `config:"port"` -- TLS bool `config:"tls"` -- ExplicitTLS bool `config:"explicit_tls"` -- TLSCacheSize int `config:"tls_cache_size"` -- DisableTLS13 bool `config:"disable_tls13"` -- Concurrency int `config:"concurrency"` -- SkipVerifyTLSCert bool `config:"no_check_certificate"` -- DisableEPSV bool `config:"disable_epsv"` -- DisableMLSD bool `config:"disable_mlsd"` -- DisableUTF8 bool `config:"disable_utf8"` -- WritingMDTM bool `config:"writing_mdtm"` -- ForceListHidden bool `config:"force_list_hidden"` -- IdleTimeout fs.Duration `config:"idle_timeout"` -- CloseTimeout fs.Duration `config:"close_timeout"` -- ShutTimeout fs.Duration `config:"shut_timeout"` -- AskPassword bool `config:"ask_password"` -- Enc encoder.MultiEncoder `config:"encoding"` -- SocksProxy string `config:"socks_proxy"` -- HTTPProxy string `config:"http_proxy"` -- NoCheckUpload bool `config:"no_check_upload"` -+ Host string `config:"host"` -+ User string `config:"user"` -+ Pass string `config:"pass"` -+ Port string `config:"port"` -+ TLS bool `config:"tls"` -+ ExplicitTLS bool `config:"explicit_tls"` -+ TLSCacheSize int `config:"tls_cache_size"` -+ DisableTLS13 bool `config:"disable_tls13"` -+ AllowInsecureTLSCiphers bool `config:"allow_insecure_tls_ciphers"` -+ Concurrency int `config:"concurrency"` -+ SkipVerifyTLSCert bool `config:"no_check_certificate"` -+ DisableEPSV bool `config:"disable_epsv"` -+ DisableMLSD bool `config:"disable_mlsd"` -+ DisableUTF8 bool `config:"disable_utf8"` -+ WritingMDTM bool `config:"writing_mdtm"` -+ ForceListHidden bool `config:"force_list_hidden"` -+ IdleTimeout fs.Duration `config:"idle_timeout"` -+ CloseTimeout fs.Duration `config:"close_timeout"` -+ ShutTimeout fs.Duration `config:"shut_timeout"` -+ AskPassword bool `config:"ask_password"` -+ Enc encoder.MultiEncoder `config:"encoding"` -+ SocksProxy string `config:"socks_proxy"` -+ HTTPProxy string `config:"http_proxy"` -+ NoCheckUpload bool `config:"no_check_upload"` - } - - // Fs represents a remote FTP server -@@ -407,6 +418,14 @@ func (f *Fs) tlsConfig() *tls.Config { - if f.opt.DisableTLS13 { - tlsConfig.MaxVersion = tls.VersionTLS12 - } -+ if f.opt.AllowInsecureTLSCiphers { -+ var ids []uint16 -+ // Read default ciphers -+ for _, cs := range tls.CipherSuites() { -+ ids = append(ids, cs.ID) -+ } -+ tlsConfig.CipherSuites = append(ids, tls.TLS_RSA_WITH_AES_128_GCM_SHA256) -+ } - } - return tlsConfig - } -- 2.30.2